From: Florian Müllner <fmuellner@gnome.org>
Date: Wed, 19 Jul 2017 00:43:25 +0000 (+0200)
Subject: workspace: Use has_pointer() method instead of property
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~209
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6878ee99d913e314129f5d3c7212fe42be1a688d;p=gnome-shell.git

workspace: Use has_pointer() method instead of property

ClutterActor has both a has_pointer() method and a :has-pointer
property (that we represent as 'has_pointer'). So far gjs was
able to deal with the name overlap, but now trying to use the
property will instead test for the availability of the method.
Just avoid the conflict by switching to the method, which is
unambiguous.

https://bugzilla.gnome.org/show_bug.cgi?id=785090
---

diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index 035a6b572..ff2618a51 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -500,7 +500,7 @@ var WindowOverlay = new Lang.Class({
         this._hidden = false;
 
         this.title.show();
-        if (this._windowClone.actor.has_pointer)
+        if (this._windowClone.actor.has_pointer())
             this._animateVisible();
     },
 
@@ -699,8 +699,8 @@ var WindowOverlay = new Lang.Class({
     _idleToggleCloseButton: function() {
         this._idleToggleCloseId = 0;
 
-        if (!this._windowClone.actor.has_pointer &&
-            !this.closeButton.has_pointer)
+        if (!this._windowClone.actor.has_pointer() &&
+            !this.closeButton.has_pointer())
             this._animateInvisible();
 
         return GLib.SOURCE_REMOVE;